quick formating fix (80%, 90%)