Removed a little duplication