Code cleanup and option comments