Update spacing and drop subpackage tag