refactor, removed test... will be added tap test instead in near future