better organization of step definitions