Add comments, some cleaning