Fixed issues with formatting