1. Minor tweaks
2. Added constants object