Made changes for consistency

Made necessary changes. Fixes #26