Deprecated FI and reuse END

Now use END to finish conditions: e.g. IF … ELSE … END
No longer use END to terminate a program (unstructured), but can use
RETURN to return
from main entry point.
Fix indenting