Removed obsolete commends and ugly "m" prefixes (we do not need them since we have modern IDEs)