minor initial code edits