Some optimization

1. Removed literal values to be hard-coded
2. Following Android-formattine convention