Cleanup whitespace
Update setup
Add voice parameter support