Source code cleanup
Updated plugin to be compatible with IntelliJ platform 12.x