Some fixes on formating