Clean up step definitions, explain some things in comments