Removed testing framework (not being used). Did some tidying of comments