Fix volume steps not showing chosen options in their respective settings
- Also follow  a better coding style

Change-Id: I7fb983fd880e46c43f5610b9a5ae1b7f5782dbea