Cleaning up code - no functional changes