cleanup and fixed miss keyword