Improved/compacting formatting