UPDATE fixing code style and usinf Function.emptyFn