Code Clarity Improvements