Little bit of code tidying