Indenty goodness for lwt.
Start of some refactoring.