Other little changes to make the code nicer!