support for minification, slight cleanup