formatting tweaks
The holy grail

thanks Adrian!