Created Surfaces class, made code a little more readable.