Clean up
Add missing option validation