fixed some nits as per comments