code cleanup, introduced new sample package