Changed to better style