refactory on cucumber features to make it easier and more readable