Core: More clean up whitespace