Normalized some class files before adding ACP features