(feat) change && to if statement
(feat) delete spaces