tidy redundant steps