wleoncio Improved formatting