Fixed indentation and spacing problems