Add style and minor fixes

No space after `=`, here and below