Only add Authorization header when token is present
Return null if no token is set, instead of false
Refactor setting the top position