Cleaned up for merge