more work
renaming + cleanup