Fix conventions, cleanup code.
Remove unused variable (eliminate compiler warning).
Update tasks.