Rename mutable to mutables
Fix whitespace issues