Refactor and some additions to Mandelbrot class