Boundary class - cleanup

test change #1
Next commit