Standardizing Draw method

Making things more uniform for draw methods of classes.