renamed methods according to style guidelines