re-format and -factoring for consistancy