Proper formatting now