Cleanup the code. Add in simple tags list.