Style and clean proiect; add member check middle