groovyfied

removed semicolons
fixed usage of def