return, if else fixes