Tidied up source and removed some useless comments.