Get rid of SUN dependency.
Whitespace cleanup
Whitespace cleanup