Coding standards corrections

Minor coding standards fixes to pass Travis tests