Minor updates and spacing