mod-manager: remove unnecessary variables; adjust annotation style;