Got rid of all those getters and setters as they were getting ugly