just formating and adding comments