Code cleanup and comments