Cleaned up FreeDraw module