cs fixes
readded legacy loader class
Merge pull request #1983 from Guite/1.4

Some coding style improvements