Removed Duplicated Code