Getting-started: Miscellaneous code tidy, and now passing all Travis tests.