Refactor bar-update a little