Refactor code

in 65 minutes and 21 seconds, using 0 compute credits, and was queued for 0 seconds