App: CSV anable
App: minor cleanup + minor test