Cleanup & normalization
Build & Cleanup