Simplification of the code and cleanup.
Simplification of the code and cleanup.

S2R2/viper,kevthehermit/viper,Beercow/viper,S2R2/viper,MeteorAdminz/viper,Beercow/viper,cwtaylor/viper,MeteorAdminz/viper,kevthehermit/viper,Beercow/viper,cwtaylor/viper