--fixed formatting and code cleanup for RG-108