Format cleaning + added tabular