CRM-13838: Cleaned up code--removed extra comments and realigned spacing. Added comments to improve clarity.