General cleanup for consistency.