Fixed some issues with formatting