Clean code
Merged files