somebody was coding drunk
removing duplication