Style/linting & removing unused code