more code climate fixes