Address all remaining line comments on APE