Yuxin  codeclimate

some code climate improvements on items