cleaning up code, playing with masonry