Minor improvements (white-space and stuff like that).