changing ids to classes, generally cleaning up code