Code Cleanup + Decorition Settings fixes.