Remaining methods and some cleaning.