Mostly syntax hell cleanup