Code cleanup, [ .. -o .. ] is not posix :/