Clean up duplication a little