Fixed whitespaces.  Fixed duplicate docleanup()