Incorporated linter suggestions and deleted redundant files