Improves condition and formating