Clean up of code & Merge.