"Return is a statement, not a function call" - cleanup