Fixed: not all properties updated when * changes
Tidies per jshint.