1. A bit of restructuring of code as well as renames