Started cleaning up code base and adding pragma marks for readability.