Merged and cleaned everything