Minor updates
Tidying stuff up