fixed readability
merge