BookMarks: Some code modernization

Change-Id: Ifb39d67d69bb97f1516bcdc70da6ca118c797126
Reviewed-by: Christian Stenger <christian.stenger@digia.com>