FIX: Minor aesthetic changes