Format code
Add options support