Refine construction
Cleanup

Cleanup