fix style, added helpers