docblock tweaks

Signed-off-by: Suhayb El Wardany <me@suw.me>
remove unused variables and some consistency tweaks

Signed-off-by: Suhayb El Wardany <me@suw.me>