Sytax, error and warnings removed