package and code cleanup