Simplify code

Use the power of the recently added Babel build step to simplify the code.

• Add tests for undefined and empty strings and throw errors where appropriate