[FEAT] Nicer look + cleanup