continued changes to structure of code