removing logs
Optimize code