Minor clean up for consistency