Refactoring before merge

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>