app.'s cleanup and comments