20130822.02 - minor cleanup (file & code-wise)