Cleaned up some minor code linting conflicts.