Removed redundant code, easier readability