Removed Code Duplication