cleaned up FromFile & other names