removed TODO and improved laravelCode