fix returns and commented code