Cleaned up for using with Browserify and Node
rename