Case 3460 - Code improvements and code style fixes.