added more styles, cleaned up code