Some Code Cleanup

Just some minor code clean up and name changes to release the code out
as a Developer resource instead of a fully functional tool