Changed access modifiers (everything private except getters and setters)