Refact for formating