Code comments and clean up