Fix alignment issue
Remove one level of brackets
Use type check to add spaces or not
More compact
Cleanup
And include correct class