code improvements
edits