tidies up atomic for simple goal type