Cleaned up Usings, performance and optimisation tweaks