Tidying up the code base before moving forward with branch resolution