Clean code
Merge files