fixme -> beautify
Cleanup