Reindented files and fixed annoying standard compliance issue