Some changes for more legible code