[WS] Some refactoring advice for myself