Clean up + finalize
Merge branch 'master' into cpisano