Code consistency and more HTML formatting