Preparing for release 1.0.0

Some clean up.