GM: Minor Code restructuring