comments, cleanup in main