Cleaned up HTML and main JS file