added finals

code cleanup