More styles and cleaned up comments