Bug squashing; style abstracting