refact: small improvements