cleaning up the code and the rest