Further code cleanup tweaks

Signed-off-by: ziycon <ziycon.eire@gmail.com>