clean up code again