re-naming and code "cleaning"