lcc: Clean up
joy: Improve API