Modify build order (hopefully improve)
Fix whitespace