fixed some minor code quality issues