Minor tweaks and cleanup to the previous commit