Update deprecated code, fix coding standards.