Changed a few methods to private