Quick code tidy up.