Minor improvements, minified version