Cleanup HTML-Model and GUI code