cleaning up code again