Some changes for better reading