Refactored code to make it more compact and legible

6 jobs for msg-box-0.24.4 in 210 minutes and 56 seconds (queued for 235 minutes and 36 seconds)