reports fix, code style changes