Made it less fugly