Clean code
merge?