Update IntelliJ Style to match Style Guide