Merge code, separated.
Cleaning