cleanup, renamed some patterns to more descriptive things