updated copyright and optimised imports