Code clean up for consistency.