Refactor: Remove ids from HTML