Updated versions to work with 30, 31 and fixed whitespace