code cleeanup