Minor cleanup of existing classes