Cleanup code
Fix formatter API