Tidying a bit
Tidying a bit