cleaning up all code