clean litlle part of ugly code ...