codereview fixes for d64173070593116e5be81195d30bc47efac23da5

cleaned some code and updated verbose name