Remove eval's, make service minify-able