Comment out 404s, code cleanup
Merge pull request #160 from CraigyDavi/organise-comment-out

Comment out 404s, code cleanup