performance improvements

Signed-off-by: pussbb <pussbb@gmail.com>