also i found that lot of code can be optimised

let me know if there is issue for same

i want to contribute in that part also