Structure & Style Updates

See commit log for details.