Remove spaces
Rename plus/minus buttons to get rid of identifier
Move default values and clean up whitespace