Improvement suggestion comment + small properties fix