Clean up of code ideas.