Added draw method for indicators; simplified code