Cleaned Agend class