Code reformatting and minor updates to comments
Removed obsolete class