Clean-up for easier editing