TABs replaced with spaces
Using 'let' for wider block assignments
Fixed the description mess around class retrieval

Candidates for removal to another spec file marked with TODOs