Small fixes && indent