Add methods and clean up