Minor code prettifing