Fix code style, so JSHint is happy.
Fix function calls.
Merge pull request #24 from ozonos/code_cleanups

Fix code style, so JSHint is happy.