organize code and comments