Valac warnings reduced (unused variables removed).
Reduce line length in source file.