Cleaned up and added minified version