Added previous work
Cleaned up some code to match stylecop settings
mend

Cleaned up extensions following stylecop conventions