Clean up comments and removed duplicate styling styling