Fix indentation; refactoring