bitly refactoring