added uglify (again) and cleaned up names