Added proper returns to last line of non unit functions
If/else block + semicolon cleanups
Anonymous functions working