Update Settings and code clean up