Little improvements kept functionality.

Check last commit details and comments.