refactor formation for more consistant usage