Added symbols, improved code