Some simple cleanup to comments and names