Moved classes around and commented