This version is cleared up from extra lines of tests, comments, etc.