Stopped computing some matrices at the beginning
Tidied up the collapsed em