Redundant object creations removed
compiled with API 21
Merge pull request #21 from infm/refactoring

Refactoring