Madeby and formatting fix