Tidying elements up for user stories