Clean code for merging