made variable definitions more explicit