code improvements, comments and others
code improvements, comments and others