a long overdue code reindentation