Refactor like a baws