code cleanup, repeittion in prints