Neaten up the code (getters and setters, reorganizing, new variables, ctrl+shift+i, alt+shift+f)