made variable names more consistent and improved output rendering.