Deprecated
Improve formatting