Internal improvements (2)

- Removed the god thingy
- Removed useless '== true'
- Use of BuildConfig