Removed HTML-wrapping, testing variables & konstants