Reducing lines

- placing 1 line if / else blocks on the same line
- combining some variable declarations into their usages