F.cleanup

Here are my semantic changes to gonexmo. These are on a separate branch to make management and merging easier as I begin to work on changes in other areas.

Let me know what you think.