Cleaned up messy merge