Moved some if-else blocks to conditional operators "()?:". Expanded all of the conditional operators.