functions edits and cleanups