reporting: simplified commands
reporting: code cleanup