Removed completed item from TODO; minor code simplification