Minor changes to each part of code