EAGLESIX-3157: fixes for refactoring, misc formatting