More refactoring
More coding style changes