Clean up of code ideas 2