Code cleanup preparing for initial release 1.0.0