Tidy up.

- Refactoring towards compatability with andrew/node-xbox-controller