Minor bugfix / cleaning