small edits, cleaning up the code.