*Code cleanup and comments