Made things private and added getters