Fixed all ises. Pls review again