New reports and cleaner code