Changed many methods to private which did not need to be publically exposed