KimJorgensen Minor code cleanup