Shorten code to pass testing.
Merge pull request #33 from devxoul/shorten-code

Shorten code to pass testing.