Minor improvements/trimming