indentation fixes, helper refactor