renamed methods, cleanup