general code hygiene
reorganize styles and make it a little bigger