Added code improvements (eko comments)