CR fix + Restructure Code