Major cleanup
Update intellij settings