Aeria Reorder | Aeria Utils | Clean Code

Signed-off-by: Graziano Vincini <graziano.vincini@caffeinalab.com>