testing some code edits after cleanup / rearrange