fixing & prettifying