code review, Warnings removed