Cleaned up messy branch merge