Fix whitespace and file issues