still tweaking related code styles