cleanup and moving css to separate file