code cleanup, code works (as before)