cleaneed up code