Some fixes, changes spacing and brackets.