removed some codesmell