removing extra returns