Removed public modifier
Added class comment
Removed warning
Reorganized and commented code.
Partial restructuring, added comments
Fixes change that causes failure