Warnings removed. "Clean" code