Simplify code
Remove log
Comments