Reformatting code

- Swapped fixed length whitespaces with tabs
- Changed import order to pull out package imports

Signed-off-by: Peter Foldes <peter.foldes@turn.com>