Remove usage of deprecated method
Move big number to a data file
Remove a few instances of trailing whitespace