initial commit and cleanup