Minor changes, I'm just going through the code