settings cleanup and enhancment