removed ;,parentheses,mutable function args and small improvements