Improved lisibility and debugging