Removed / updated many decode statements