Comments, tidy up
Tests and comments