Clean up other functions and loops for lint