Fixing lint errors and indentations. Some lint errors already present in tests, not sure how to fix them.