Code formatting
Re-enable functionality on the preferences page