Minor bugfix & style