Reformatting
Prevent pool_speed being set to null in pool

Plus a bit more reformatting