Whitespace alignment
Replaced crude hack that forks to shell with native code