Issue #2490782 by MegaChriz, donquixote: Added parameter types for a few docblocks and some other code style fixes.