Did some home-cleaning, too many comments