1.0.4 linting and refactor