new array push/unshift and refactoring tokens arguments