Cleaned up the code, changed name, etc.