-- code cleanup and indentation, GEP-50