Restructure scaffolded code without making any functional changes