Minor code cleanup; Comments: