Fix - do helper methods the right way