improve whitespace style
restructure codebase for simpler configuration