Remove leftover trace and fix block comment
Refactor
Refactor header into independent component. Closes #265