Format changes and cleanup