Removed a bit of duplication