Cleaned formatting, hunting segfault