comments cleaned & unitary test passed