added getters and setters, improved method names