Some code style refinements
Extract clean conditionally reason
Merge & resolv conflicts for "Extract clean conditionally reason"
Merge pull request #63 from PagedeGeek/master

Some code style refinements