Add comments, remove DEBUG