Updated names and made helpful comments