Increase indent and minor refactoring