fixed trivial issues, based on the review