updated to minify code