Removed unneded getters and setters, enhanced readme