Moved around code and wrote a class comment