Removed unneccessart getsetters and added comments