Squashed names

Used locals to reduce minified file size
Merge pull request #33 from kenshinthebattosai/working

Squashed names. Fixes #32