minor syntax changes, preparing to refactor