Adjusted variables and proper use shortcode_atts

More consistent and properly names variables. Proper use of
shortcode_atts to use the set variables and not check the $atts array
etc.