cleaning the code, better performance, change main.css