more code cleaning and repackaging.