Minor bugfix+cleanup