compacting some code, making some comments, etc etc