Some cleanups in code: removed warnings, added task.