Encapsulation & Cleanup Sweep #3

Reformatted at a 2 space indentation and updated comments.