further cleanup, for consistencies sake