applied some code quality updates