refactor, fix indentation