code cleanup, everything should work