work on styling and comments