Cleaned up funky merge