Style update, bug fix