(#1026) - remove conditionals
(#1027) - change function statements to expressions WITH PASING TESTS!