Visual refactoring: indentation fixes and 2 files renamed to CamelCase convention