tidy up
Merge https://github.com/Matt--/gameOfLife
tidy up