Fixing issues with formatting