Tidy up

Still haven't got round my requirejs issue.