Did some linting, cleaned up descriptions/annotations.