Tidy and clean up repo a bit