- methods templates cleaned