Fixed my warnings and 改了缩进