Reduce whitespace
Reduce redundancies