removed water variables, shortened helper functions