REFACTORed & improved comments