Did some linting, cleaned up some files.