small style changes, editing refactoring