Some improvements + indentation