Code clean up.
Updated builds.