renaming and cleanup, #64