Comments and code clean