Further spacing & code style corrections.