finished pattern markup
general cleanup