Add linting & clean up style