Commit 1.24

Tidying up