Cleanup to pass style checks