made minor changes and minified