code cleanup for general report manager