More logical methods names
Tidying
Basic test for verbose output.