UNIX whitespace
Improved architecture