fixed minor code quality issues