done some code quality changes...