Code refactoring, Opera and maple fix