Refactor for cleanliness, and add tab autocompletion.