Default affiliation is publisher, fixed identation and did some refactoring