clean code
merge