Revise client's comment
Fixed and clean code
remove unused code
Fixed raw shortcodes
Clean p and br tag from shortcode