Slight design tweak