While at it, also reorder the items for improved readability. Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>