Small changes + gasparovic

Code cleanup, pattern fixes, +"prezident" gasparovic