Small documentation refactoring/improvements
Fix some minor code smells