Manual Merge of More Linting #391

See #391