Clean up and new design