Corrected default drawing color; reorganized main class