Review code tweaks completed and IntelliJ support added.