Cleanup in the code