Fixed some of the code inspector complaints

Please review @schilit