general changes. cleaning up code.