Settings - Code cleanup