Make everything more standardy