// cleaner Before / After mess