Minor Fixes + Formatter Preferences