Fix Formating. To Do fix alignment