sample > minor code quality fixes