Refactor hardcoded strings, fix duplicate header