forgot some cleanup/updates to initial version