applied some naming conventions