Refactor using landscape.io's suggestions