Small simplifications

Hi Ravi,

Here are some commits that:

- Make the whitespace style match
- Get rid of the terminal stuff (it's not really necessary and it can cause more problems than it solves)

Cheers,
Keith