Reformatting code and small refactoring.
30 files changed