Cleanup my own code