Make it better

Proper whitespaces + optimazation