Report update, code refactoring