- Use calendar format in all Javascript
- Cleanup code