Cleaned up Silva fix

Searching through completely uncommented code for helpful functions is
(queue Spongebob rainbow) *fun.*

Messing with the script for the sake of a bugfix bothered me from the
start; this is how I should've done it.