Refined indicator's code for performance and efficiency
Updated Documentation