General cleanup for the sake of beauty?