renamed reserved symbols. fixed some errors/typos and indentation