insert comment and change the naming conventions