Little improvements

Too long line. Maybe, we can use scope in this case? What do you think?