TONY: Fix some British comments
TONY: Reduce the scope of more variables