Part 5: minor fixes
Part 5: Finalization, minor comment and whitespace fixes