Clean up arrays/spacing