Small changes
Clean up