clean up code and modify styling