While editing the files some other minor modifications like pattern
matching and using APIs that reduce type casting.