Making the code neater, nothing big.