cleaned up code, re-minified