Made changes for consistency