Style refactoring on indentation and spacing