formatting/comments edits/cleanup