Cleaned up testing web-page and code