Cleanup

Added a better guid method