Made changes for consistency

Made necessary changes