Removed unused types and member variables, fixed formatting

Also renamed some types for clarity and added some empty lines for
readability.

Change-Id: Ibda8bb56472275c11edabdabf1277ffa2d050370
Merge topic 'scalarbar_actor_cleanup' into master

e893f1dc Removed unused types and member variables, fixed formatting