Clean code
Merge commit '85753943c47706901a2835b8cce70dffe1c25e87'