cleanup
cleanup
refactored to switch statement
added a filter step