UT: Clean up and re-structuring