simplified

made some simplifications and removed quote conversion, since that's
supposed to be done at runtime