Cleaned out all the botcha and moopapi inconsistencies