Removed Unnecessary If statements