Renaming for clarity
clean up code for clarity
Merge branch 'master' of github.com:usmanismail/gpns