cleaning up the code stuff