Cleanup based on y-trobinso's feedback.