Small improvements

Again it's just small and I guess could just get melded into your commits to avoid having too many commits.