Tidyed up
Preparation for publishing