Added more comments, removed silly TODO