Bug fix / formatting