finished cleanup  module templates markup