Remove some spaces.
Add some apc related comments.