Refactor (spacing)