Tidy up, fix name cracking