code style changes. Includes codeStyleSettings.xml for Intellij