Refactor and Cleanup, use Calabash component