More code prettifications