Reports 216: Cleaned up code