packages update
code cleanup