Clean some white space.
Add timeing.