Small refactoring + code indent