Increase readability and use more better colours