Some small clean-up. Bracket arrays. Docblock improvements.