cleanup, replace haml template