packages; code cleanup