Updates

cleaning up code.