I didn't want to pollute this PR with docBlock and cleanup changes. I though it would've been harder to review that way.