Comments added/warnings removed