Refactor slightly before testing on *nix