tidying
tidying, commenting, thinking and starting on HCN right same-ness