Remove extra imports
Use setters instead of referncing variables