Slight modification for better style