Cleaned up extensions following stylecop conventions