String update and cleanup
Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>