Added better style and use