Some style cleanup and comments