Cleaned up variable names and comments.
Moved constructors to top of Class definitions