Project cleaned up and functions amalgamated into a single class for easy import