Code cleaned-up off comments