Changed some names and added comments