Add class members and remove getters. Some more minor cleanup.
Add class members and remove getters.
Some more minor cleanup.

JensTimmerman/radical.pilot,JensTimmerman/radical.pilot,JensTimmerman/radical.pilot,JensTimmerman/radical.pilot