Cleanup

Make the intent a bit clearer