Minor change

Made fields private and added some getters