Slightly cleaned formatting