Code tidy

Tidy up of code standards, documentation, reduced cyclomatic complexity, and other miscellaneous bits.

Addition of filters for both taxonomy args, but no functionality changes otherwise.