Fixed getters and setters. Reformatted and commented.