Clean code
Fixed some problem