Cleaned up duplication