Code cleanup and 1.0