Cleaned up code - no functional changes