Non-functional update: remove dead code and clean formatting