Cleaned all code with linter and removed public attributes