changed cursors, added IntelliJ IDEA style join lines