Changed naming scheme; added comments.