Code cleanup; FIRST RELEASE VERSION.