Minor performance improvement
Removed the 'M' and other cosmetic changes for consistency with db version