Refactor, header and levels