A little cleanup and originization