Minor cleanup

Added big visual markers to divide the little sections.
Can add functions to the namespace.