Code-formatting; removing anon functions