Renamed some parameters/methods, added some getters and setters