CRMT Changes
Cleanup/minify