Unit04 and general whitespace cleanup.

Signed-off-by: Tianrui Guo <tianrui@pac-rom.com>