cleaning up the code!