Cleaned up project after with the help of linting