more refactoring
Signed-off-by: timothy <timothy@timothy-linux.(none)>