code quality tweaks