Updating symbols list + Minor Cleanup