White-space
Reduce complexity of DB query calls