[FIX] Fixed a whitespace character problem and did some minor changes.