Small refactor.

Signed-off-by: crynobone <crynobone@gmail.com>
Multiple code improvement.

Signed-off-by: crynobone <crynobone@gmail.com>
Remove duplicate key.

Signed-off-by: crynobone <crynobone@gmail.com>
Tweak use order and update docblock.

Signed-off-by: crynobone <crynobone@gmail.com>
Small consistency.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2