Style changes and fix Decrement.