COding standard, fix high priority problems