cv.c: Fixed indentation
Refactoring
More refactoring, also screwed it onto libnotify.