Comment + code clean