General cleanup
Merge pull request #137 from nickatbuddy/na_cleanup

General cleanup