Reviewed code, made some renaming