code cleanup, more tests, 100% test coverage cucumber