Code clean-up and results from testing