Cleanup; Fixed warnings