cleanup
A few helper methods
More cleanup
Fixing the System View for Mass Transit. more to come in terms of visuals