Made boundary class easier to read