Refactor strip_token to conform to styleguides