Replace horrible stuff with more confusing less horrible stuff