Numerous changes to improve code