Made pretty good look
Improve some logic