#437 Reworked header and made minor style changes