Improved performance

Signed-off-by: Nick Kamper <nick@nick125.com>