Linting and stripping out redundancy