The drawing is now done by a separate class, unused fields removed, code cleaned.