Clean and minor changes